From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 26 Mar 2004 16:17:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23489
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=804f3d63d3d5728979cbc8861fc2d2fe66b6f93e;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5020ef0da4..61014b3103d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* vc.el (vc-maybe-resolve-conflicts): Don't prompt the user.
+
 	* calc/calc.el (calc-mode-map): Use mapc.
 
 	* apropos.el (apropos-mode): Don't autoload.